From 0600ffee917ca8d30f4c67452880c840f2210418 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= Date: Thu, 4 Sep 2014 13:20:37 +0400 Subject: [PATCH] Revert "cargo/new: add test for `--travis flag; also update Cargo.lock" This reverts commit 4ee5fd352a0071f4200fe9f3dfa4aeebfe164c18. --- Cargo.lock | 43 +++++++++++++++++------------------------ tests/test_cargo_new.rs | 14 -------------- 2 files changed, 18 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f31305d7b..2f70d2866 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,40 +2,40 @@ name = "cargo" version = "0.0.1-pre" dependencies = [ - "docopt 0.6.2 (git+https://github.com/burntsushi/docopt.rs#52fd504ac4d9e9599adf0da51357dce00221d1de)", - "docopt_macros 0.6.2 (git+https://github.com/burntsushi/docopt.rs#52fd504ac4d9e9599adf0da51357dce00221d1de)", + "docopt 0.6.2 (git+https://github.com/burntsushi/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9)", + "docopt_macros 0.6.2 (git+https://github.com/burntsushi/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9)", "flate2 0.0.1 (git+https://github.com/alexcrichton/flate2-rs#12593d1b9ccf09c2eabac176a6e233b171eed843)", - "git2 0.0.1 (git+https://github.com/alexcrichton/git2-rs#e26e6d635f74f02e4c627d07daaaf2a1483e7b10)", + "git2 0.0.1 (git+https://github.com/alexcrichton/git2-rs#f2b79dd951e92171b151100d69c32c0bf137a328)", "glob 0.0.1 (git+https://github.com/rust-lang/glob#c4495d9f2f2a1b22173b860f907760ba8c419843)", "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git#f0fd1546b0a7a278a12658ab8602b5c827cc3a42)", - "semver 0.0.1 (git+https://github.com/rust-lang/semver#df163f7b22686493b037eee1f1f9d1a2742f9bbe)", + "semver 0.0.1 (git+https://github.com/rust-lang/semver#c78b40d7fdf8acd99b503e6ce394fbcf9eb8982f)", "tar 0.0.1 (git+https://github.com/alexcrichton/tar-rs#d4ce3448a1a229b78f16d31682140c2843479481)", "toml 0.1.0 (git+https://github.com/alexcrichton/toml-rs#e3ce3517348dd5f6f6306dc1f3bae7f9dd77c0fe)", - "url 0.1.0 (git+https://github.com/servo/rust-url#d894135cac4e0085f41ba3a816240b792f9e6154)", + "url 0.1.0 (git+https://github.com/servo/rust-url#bb68de835ad945a72fba44979944a587ba83941a)", ] [[package]] name = "docopt" version = "0.6.2" -source = "git+https://github.com/burntsushi/docopt.rs#52fd504ac4d9e9599adf0da51357dce00221d1de" +source = "git+https://github.com/burntsushi/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9" [[package]] name = "docopt" version = "0.6.2" -source = "git+https://github.com/docopt/docopt.rs#52fd504ac4d9e9599adf0da51357dce00221d1de" +source = "git+https://github.com/docopt/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9" [[package]] name = "docopt_macros" version = "0.6.2" -source = "git+https://github.com/burntsushi/docopt.rs#52fd504ac4d9e9599adf0da51357dce00221d1de" +source = "git+https://github.com/burntsushi/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9" dependencies = [ - "docopt 0.6.2 (git+https://github.com/docopt/docopt.rs#52fd504ac4d9e9599adf0da51357dce00221d1de)", + "docopt 0.6.2 (git+https://github.com/docopt/docopt.rs#3bf52a9f9cf13e00cca00ff49da39d5c9caa48e9)", ] [[package]] name = "encoding" version = "0.1.0" -source = "git+https://github.com/lifthrasiir/rust-encoding#35f0d70f65f73ba16f296f9ec675eddee661ba79" +source = "git+https://github.com/lifthrasiir/rust-encoding#15de58b9cb1fb5998aa6217e794d557eaf80a31f" [[package]] name = "flate2" @@ -45,10 +45,9 @@ source = "git+https://github.com/alexcrichton/flate2-rs#12593d1b9ccf09c2eabac176 [[package]] name = "git2" version = "0.0.1" -source = "git+https://github.com/alexcrichton/git2-rs#e26e6d635f74f02e4c627d07daaaf2a1483e7b10" +source = "git+https://github.com/alexcrichton/git2-rs#f2b79dd951e92171b151100d69c32c0bf137a328" dependencies = [ - "libgit2 0.0.1 (git+https://github.com/alexcrichton/git2-rs#e26e6d635f74f02e4c627d07daaaf2a1483e7b10)", - "url 0.1.0 (git+https://github.com/servo/rust-url#d894135cac4e0085f41ba3a816240b792f9e6154)", + "libgit2 0.0.1 (git+https://github.com/alexcrichton/git2-rs#f2b79dd951e92171b151100d69c32c0bf137a328)", ] [[package]] @@ -64,18 +63,12 @@ source = "git+https://github.com/carllerche/hamcrest-rust.git#f0fd1546b0a7a278a1 [[package]] name = "libgit2" version = "0.0.1" -source = "git+https://github.com/alexcrichton/git2-rs#e26e6d635f74f02e4c627d07daaaf2a1483e7b10" +source = "git+https://github.com/alexcrichton/git2-rs#f2b79dd951e92171b151100d69c32c0bf137a328" dependencies = [ - "libssh2-static-sys 0.0.1 (git+https://github.com/alexcrichton/libssh2-static-sys#e348c464f94f125cb1491a0ef63b8657012c6b75)", "link-config 0.0.1 (git+https://github.com/alexcrichton/link-config#e378605ce4099008b1dab8f39619d91dc8887946)", - "openssl-static-sys 0.0.1 (git+https://github.com/alexcrichton/openssl-static-sys#b8f2500c39932e9d022dcc2590493ab0cc144e2a)", + "openssl-static-sys 0.0.1 (git+git://github.com/alexcrichton/openssl-static-sys#b8f2500c39932e9d022dcc2590493ab0cc144e2a)", ] -[[package]] -name = "libssh2-static-sys" -version = "0.0.1" -source = "git+https://github.com/alexcrichton/libssh2-static-sys#e348c464f94f125cb1491a0ef63b8657012c6b75" - [[package]] name = "link-config" version = "0.0.1" @@ -84,12 +77,12 @@ source = "git+https://github.com/alexcrichton/link-config#e378605ce4099008b1dab8 [[package]] name = "openssl-static-sys" version = "0.0.1" -source = "git+https://github.com/alexcrichton/openssl-static-sys#b8f2500c39932e9d022dcc2590493ab0cc144e2a" +source = "git+git://github.com/alexcrichton/openssl-static-sys#b8f2500c39932e9d022dcc2590493ab0cc144e2a" [[package]] name = "semver" version = "0.0.1" -source = "git+https://github.com/rust-lang/semver#df163f7b22686493b037eee1f1f9d1a2742f9bbe" +source = "git+https://github.com/rust-lang/semver#c78b40d7fdf8acd99b503e6ce394fbcf9eb8982f" [[package]] name = "tar" @@ -104,8 +97,8 @@ source = "git+https://github.com/alexcrichton/toml-rs#e3ce3517348dd5f6f6306dc1f3 [[package]] name = "url" version = "0.1.0" -source = "git+https://github.com/servo/rust-url#d894135cac4e0085f41ba3a816240b792f9e6154" +source = "git+https://github.com/servo/rust-url#bb68de835ad945a72fba44979944a587ba83941a" dependencies = [ - "encoding 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding#35f0d70f65f73ba16f296f9ec675eddee661ba79)", + "encoding 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding#15de58b9cb1fb5998aa6217e794d557eaf80a31f)", ] diff --git a/tests/test_cargo_new.rs b/tests/test_cargo_new.rs index 5585fefeb..a60f7a712 100644 --- a/tests/test_cargo_new.rs +++ b/tests/test_cargo_new.rs @@ -65,20 +65,6 @@ test!(simple_git { execs().with_status(0)); }) -test!(simple_travis { - os::setenv("USER", "foo"); - assert_that(cargo_process("new").arg("foo").arg("--travis"), - execs().with_status(0)); - - assert_that(&paths::root().join("foo"), existing_dir()); - assert_that(&paths::root().join("foo/Cargo.toml"), existing_file()); - assert_that(&paths::root().join("foo/src/lib.rs"), existing_file()); - assert_that(&paths::root().join("foo/.travis.yml"), existing_file()); - - assert_that(cargo_process("build").cwd(paths::root().join("foo")), - execs().with_status(0)); -}) - test!(no_argument { assert_that(cargo_process("new"), execs().with_status(1) -- 2.30.2